We need to refactor these classes to extend an Abstract class not depending from fungal doing the important part of the job. That abstract class will be extended in AS7 too with its specific implementation and dependencies.