Added option to display object names/types