Revised - Included content loading imports in main class