Now uses objects instead of strings