Update mocks, crosslink resources