Adding basic code for maps