Adding specific query for parser state and basic wrapper.