Updates to conform to newer API