Update to latest standards