Made WPL less resource consuming