UCI parser rewritten