Adding concurrent dev/production support