Add query map support with default args