Improving annotations parser [ci skip]