Fixed types & removed ArrayOf