Work autogeneration enhancements