Add support for multiple type lists