Made proper mapping when loading and saving