Changes to including classes