Code generator changes