Add new codes for Swift review