Updated loading from config to include locations