Add a few modifications to swift