Improved params management