Removed generic getStorage method and replaced with distinct calls to getters