That said, this API is fine. Lets keep it as-is.