Added ferry support
Added ferry support