Added data stubs and template scaffold