Wrapper ready for pagination
Wrapper ready for pagination and refactored