renamed attribute_mask_ attributes (no prefix now