Development Plugin Improvement