some corrections in the controllers. New collections types instead of returning maps