Don't map unexported fields
Merge branch 'query-plans'