Added validation to core and to UI.