Contact - make map a non-collection class