Refactor to read new manifest data layout