Fixing a few import bugs e type definitions
Adding save store function