Adding Collection support for better code reuse