Switched to mapi to return array