Updated abstract classes