Revamp of persitant storage and rewire of it using Entity Framework