Fixing the ability to use maps as domain class properties that are not associations