Changing the loading scheme to allow for better configuration