Enhancement performance improvements