Changes for Swift