xconnect additions from bloodyds branch