Second revision of Omneity - in Java