Added defaults for storage and linked accounts