Should be enough to write the backwards-compatible API