Revamp generate method + introduce pagination