added external storage and entity framework   -  not tested