Fine tune.
Add class manipulation.