Update for newer features