Moving adding state logic to ExecActivity