Add typedef support