Adding sublist and minor changes.