Added shell-specific hooks