Changed + regex to use the name of the property rather than the definition.