Parser switched to regex for better accuracy