ENHANCEMENT: Added composer