Use new cell registration pattern