Switched all component storage to be by description