Updated user to include pagniation