NEW: Added composer support