Added new similarity measures + factory/parameter