Part 1: Interface changes