Updated to check for Collection & Paginator

This hasn't been tested other than trying it in code to check it works!