Update parser and work towards better array support