Mickael -- some bug fixes + the mapping merging feature and the schema tags