Added guarding/fill ability to waterline models