Added instance swizzling