Modifications to includes