Moved inject singleton annotation to original class instead of a module