#SW Added management