Made cation mutation compatible with new classes