Moved some configuration parameters into class parameters