Added unit management