Added Map to output