added property mapper