Sorry for the late response. If composite keys are going to be the more common case, how about forcing a collection always? For the non composite case, you could pass in a list of one element perhaps.