Update to new standards