Add swap storage to common