Simplify API, get rid of "default" versions