refactor(rest) onFS