Moved to own namespace for local deployment