Changed instantiation method