Validation and safety added