Registry minor improvement