Adding globbing support