Enhance the directive