Improved code for extra job options features