Add support for abstract class