Added getters for private fields, added support for vesseltype, fixed a bug