Fix Database Table Creation for S2.3+