Adding basic map management