Updated for slist and mod expr