Added Forex and Wlm and refactor