wrapped some methods
fixed registry singleton - extra reference in wrap method