Added in expression generation for basic types