Fixed abstract class issues