OO wrapper for store and related engine bugfixes