Updates to convert to express