add new class system and inject