Including latest api changes