Maintain context through includes