Added the wait action support handler