Change/add more classes and properties according to ERMI paper