Added UserBuilder, and some additional convenience methods