File store reimplementation