Refactoring Trait Package (removed __construct)