Naveen added some validation for some interfaces