I suggest we drop this as well, I think it makes more sense to expose the underlying functions.