Added attribute definition in attribute creation and editing