Allow custom properties in format strings
Refactor