Added map overrides