Added enums in listQuery