Added support for other new object type