Updated VAN to re-include Avatar suffixes. Also changed CNS to be conspiracy type