Added wather and wolfram support