Changed the interface structure