Fixed wrap method. The only thing which doesn't work atm is Store.new