Added Flag and Topic scaffolding