Swan storage option

Add "Cloud" as default storage option (for expression which do not
contain the storage key)