Add possibility to return data as array