Adaptor changes, along with fluent returns.