Reorganize execution pattern