Adding Collection support in