Updated to work with the latest config changes in M05.