ADEN-1041 Refactor vars exported to JS