WpTarget modules reworked