Fixed Create Tables