Clarify mappings structure a bit