Database Structure Fix And Models Creations