Added Ecore; added check of TOF calculation