Adding comments to Mock-Registration mechanism