Validation implemented & tested