added support for return number and point source id