Floating IP rework in Plugin