Added support for Composer