Update Storage

- Returns singleton instance
- Makes use of a dirty flag to circumvent concurrent modification of
  storage