Added support for hidden objects