switching to class-based injection