Move constants to parameters