Using INamed here is not essential. Fixes #8