Retail - pagination support added