Better attributes handling
Still more style
More style