Updated the generator
Updated abstract classes