Fixed Interface issues