Make non messages also choosable by Client initialization.