Update for newer swift lib