updated to new (0.5) collection API