Updates to new Stable API