Modified Entities according to DB changes. Login now works