Use Maps instead of keyword tuple lists