Upgraded composer