Add missing attributes and align existing attributes