Expanding list of annotatable objects see #11342