More swift support