Added handlers validation to be from the list