added properties mapping