Enhancement: composer support