Mechanism of validating user's inputs is updated