Added support for abstract class