Switches for targeted DB and SP added