Updated Storage to be much lighter and allow for external access without mixin.