Light classes refactoring