Added Map to builder