#4 : Fix catalog read/write