Use optional variables to play nicely in dev and prod