Compound key support!

@jcarouth can you look this over?