Add attribute feature upstream