Changes to reflect new Swift array syntax