added changes to support more than 50 records in response