Db & Model Fixed