Second update to conform the new Swift Language changes