Image parsing functionality improved.