Make auto_map optional, default to false