Changed parent class of Instrumentation class