More IP plugin work