Explicit None check
Make bool_matrix more powerful
Support groups in mock avatar