Vessel class refactored.