Update to match latest changes