If we decide to use List/Map in GQuery, it's better to use them everywhere