Now uses objects instead of strings when loaded