updated to new composer-structure