Feature/composer