added extended parsing