More work on manifest parsing
Update manifest parser