Mappings are now sorted too.