Removed the Office class, since it only wraps a immutable string field