Updated users table to User
Created Map table