- Changed Sets for Lists in an attempt to keep ordering