Feature/support in composer