Add the ability to change the property lookup