Added unique compound key to fix concurrency issue during save. This fixes #6