Added noswpfiles option