Update to support dev and test env