Further changes, added some query maps