use correct storage types