Corrected the classes based on the interfaces.