Added Map extraction