Improve composer support