Added facilities managing fix