Improving the support for composer