Removed Control interface
Renamed BaseControl to Control
Fix option required