Added the correct datatypes and indexes so automatic creations will work correctly