Collection's controller improved