Return self where applicable
Update version