Added (rudimentary) multi account support