Add  params handling