Feanil/pre stage

Changes need while setting up the stage vpc.