Updated for latest swift changes
Updated for swift changes