Added optional view-friendly collections