WordService and WordModel fixed