Moved to a custom manager and queryset