Wiki Migration - Code review changes