Added placeholder classes, and dirty singleton