Several wiki model improvements