Adding support for property placeholders