update: use new dictionary & improve parser