Another update to helper include statements