kmdlib related changes.