Added support for new placeholder