added feature flags and template