Added pagination support
PEP-8