Add more type expansion