PLA-1157 adding lang support