Updated models to run on EB and/or Tao's RESTServer