Changed objects to classes