Feature/compose