Use first order collection instead of a plain map