Multiple organizations support

@mlu-appear OK.