Enhanced placeholder system

References #3.