Fixed parser not working with the new structure