Added some values to be returned