Modification according ENML4j 0.1.1