Improve the construction of lamba parameters