Added Map and Token functionality