Added ContentStore and FileStore.