Implemented swap function.
Moved none_ attribute to other attributes.