Move the parameters up one, include type