Refactored users table