Exec refactoring