Refactored current classes