Added option for expression tables