Switched to using InjectAttribute