Refactored for MxcGenerics.
Refactored, dependency added