Use a map instead of a fixed slice ordering