Updated Composer class