Added base composer