Use tuple list instead of Map