Make more stable for new attributes