AutomationPattern Consistency Changes

Updates AutomationPattern to be more consistent with master.