Added validation of operators