Change arg handling in main hook