Added pointer support to the expansion