Refactor/path transforms