Stop relying on parameter injection