Move add_unit logic into Application