Modifications for new automation changes.