More parameters made configurable