Fixed the classes to fit the interfaces.