Enhancement of ECDIS and GMDSS Simulator