Recreated table in db to make it use non null's and unique