Extend parsing capabilities