Improvement in parsing option