Modify some class properties.
Add more utility classes