Validation features added