added more collection macros