Reinstated original class instantiation structure