Parameters key handling improved