Mapper implementation.
*improvements in code.
* remove Variable domain class.
* remove usage of Variable domain class.