Updated to new Swift version