Refactor Map properties method + Add UserTable model