Add Word and WordStorage class