Improve composition possibilities