Updated user to include pagination