adjusting mapping to not analyze key and list