Fork of a plugin with UD specific improvements