Fixed parser and add glob