Added some more general classes and added Strawberry.