Improved the Unit Management part