Greatly improved property maps