Updated auhtentication and provided pagination