Fixed cat mapper bug and added variable table saving