sharedInstance Storage now use instancetype

Fixes #343