Changed property mapper to utilize inflector