Add list collection handling