Interface issues fixed

Interface issues fixed