Changed strings to classes