Fixed some interfaces
Fixed some interfaces