Fixes crash and adds mapping for new properties