Some more comments added, selfInstance rewritten to registryInstance