Updated contracts and implementations