Refactoring in progress
Translation added to big pipeline