Added decl and impl headers