Re-added wordcount, causing issue on upgrade
Added manifest changes