Refactoring manifest details code