Uncomplicated the database table creations and merged the migrations