Improve composer consistency