Feature/add composer support