Paired commit with 22402. Makes necessary schema additions for the extra parameter...