Fix return type of Model methods