Use List instead of Set to make sure that the returned order is preserve...

Make sure we keep a list