Should also use kwargs instead of a map