Add support for device default storage