Updated abstract class