Updated to use model classes instead of just strings