refactored relationship names
renamed some badly named variables
implemented new set datamodel
implemented new map datamodel
fixed typededuction for lists, sets and maps