Improved includes controller