Updated ship methods and types