Enhancement/attributes

Don't change when not needed