Add support for nested and object types