Manage more parameters

Edited by Fabien Combernous