improving property mapper