Adds Storage weight calculation