CurrentTool refactoring and Validate on load