Moved WP generator to subgenerator