Table creation modified