Continue the refactor on mete data structure change.