Added PropertyAccessorMapper support