Update the public API

Drop the NoOp

Add returners up to 9