Add of the mask
Rename of some attributes