Refactored to use new AisLib