Update to array lookup