Added DetailOnDemand Functionality & Legends