Modified Ontology, Added Message Factory