Some changes for swift