Refactored Transliterator componenent #25