Use new WPOO-class