Adding default Composer support