Add ICrateStorage, update related code. Closes #7