model changes for Swift