small refactoring. further samples adaptation for new manifest format