full refactoring and augeas support