Rename flags class
Add class flag