Custom Fields per Client/Site

We need the ability to add custom fields to each location under each client, as the token for certain program installations can be unique per location, not just per client.