Added support for more types and attributes