Includes updates for compatibility with cfg object.