Add dev switch for basic call