Fixed errors related to changing to implement new interface.