Tweak implementation to use 'id'