Add custom storage support, bump 0.1.8