Added map (not finished yet)