Update with attrs changes

Make it work after conflict merge