Improve the directive