More work on manifest