Add individual classes for top level objects

Use `&&` instead of `and`.