JC-1449 - Client side refactoring, localization