Yogesh | 2684 | Added translations and refactoring