Better parameter handling
Merge commit '7a1ea6b08b775e24f0e5735f1a374453432137d3'
upcated consts