Moved add_attributes to BaseMethods