Some api changes