Refactor personal manifest