MXR-99 integrate environment into system
MXR-100 fix configuration in self closed tags