Updates AFSpritz classes with new enhancements