Updated: Add some zsh compatible code