Added support for composer