Some fixes in DBContext Model