Move instantiation to place used