edame refactoring schemas