Added Module, Interface, and InterfaceWithDefault back in (accidentally deleted during refactoring).
Fixed PageLoader functionality.