Maybe it could use the Site object? I could open a ticket for future enhancement.