Added DatabaseProxy and TemplateParser
Added DatabaseProxy and TemplateParser