Further development for Swift changeover