New: Add dir for executor
Update: Fix bug