More maritime implementation