Added placeholders handling