Improve the include method