Some api changes.