Use catinated instead of compound key.

Closes #14.