Composer Improvements