Added more checks for interfaces