Changes for local deployment