Updated how the loader is set up