Update to latest components