Updated for EvoDashboard 1.1