Simpler inheritance for data structures, doc and test update