Added maps support to data clients