Improved code to include WP Utils