Edit Bateau:class and Map:class