Major updates to Efficiency Data logic