*---> Refined all classes!!!