Fix to injection and decorators