+ Refactoring of domain/range to dimension/measure
+ Modified entity factory to reflect domain/range refactoring