Feature/add composer