so should we add this to all controllers in v2?