collection classes moved into registry classes