Added more implementation for Record and Collection