Collection changes for REST compatibility