WIP: refactor manifest class