Update for Full Inspector 2.0