Added globbing support