Conform to new changes