Removed storage from base api and inserted where necessary to compile.