Added support for placeholders