Refactored the loading to work without websites.