Note dev and prod support