Moved flag for use_internal_storage to settings