Minor fix to CD. Changed Core to contain a Map of accounts and users
instead of a Set.