added file_store and updated the include files accordingly