Added suport for composer