Updated maps to working consistently with other mixins