Changes to interfaces and implementations of poll and client