More work on collection spec