A few changes to make it work with the real smartstore