Update to the current implementations