Re-wrote model interfaces to return Sets instead of arrays