Enh: improved placeholder mgmt