Update implementation based on spec simplification