Improve INCLUDE directive