This also includes the parameter extension functionality again, which for whatever reason is missing from master. Mostly notebook related though.