Wip sd filestore optimization