composers refactored, 2.1.0