Added KissMetrics support, improved key conflict resolution