Modified data extract functions to support the new event system
Minor style change (event hover added)