Add common-intro and common-setup