Moved responsibility for parameters around