Enhancement/attributes

Not here too