Add query map support