PropertyMap works now, but some more work left