improve composer support