Simplify some arguments, more API docs