Feature/rahul nath/empty list