Added interface check