Fixed classes and adding interfaces