These are currently package private; since we're releasing a 2.0 anyway maybe we could make them a part of the public API as well?