Enhancement/attributes

No return in fact