Added subclasses for objects