Injection no longer needed
Incorporated server changes into the main branch