Add option to just pass back array