Some fixes, changes in services structures. TODO: Import TransformationTrait