Improved makePlaceholders