Objectstore enhancements