Handle the two environments (prod & dev) better