Add augroup protection