Changed the interfaces