More changes. Trying to properly take account of enumeration and valuetype as type of attributes. TBD constraints properly handled