Moved loading code into builder class