Add Pageable view and better logging