Assemble enhancements