Added tables with safe operations