Converted WikiBundle to new form system