modified args to be a map, based on @ceejbot's feedback.