Conform to new standards