Updates to how storage/db functionality is handled