Make storage just a bit easier