Updates for Swift support