Added support for more types