Changed models from interfaces to classes