Add short circuit eval
Use global variables for deploy msg