Adding code for registrywrapper