Directive 8020 performance enhancements