Updated structure and Composer management.