Refactored grid user model