Improved: composer support