Work on manifest structure