Added tracking to soulmates component