Made system work with weblocks-stores