Include Structure Improved