Added easier to use maps