Attrs management fixed