Structure and composer update