* Added compatibility with version mojo >= 5.0