Improve team billings and make management easier