Modify: trim name.
Add: for class helper.