Moved target groups into Build service