Changes for instancing