Improved and refactored WP tools.