Partial Export/Class Extension updates