Also, this doesn't match the interface of all the other modulestores. Is that intentional?