Query Parser: introduced immutable data structures