Feature: Self-contained Annex