Updated key and validator property names to prevent collisions