Improve composer