Added watercraft support