Update for hard api changes