Add api() manager and clean up distinct()