Added manifest and underscore