Refactor: Move user data to separate model