Add: refact messages parser