Added extra field substitutions (more logic to follow).