Better mapping properties handling and tests.