Add initial multi-gender and multi-user support