refactor default.pp and add Gemset