Extended and changed Storage API

Storage API should be complete now. Everything seems to work as expected
:-)