Added full collections functionality