Improved orderMap signature