Enchanced
Some classes