Add individual classes for top level objects