Moved some loading logic to base application