Added some changes and User EF classes...