Working on composer support