Futher changes in using smart_list