Eliminated inconsistency in using @Singleton annotation from javax.inject and com.google.inject packages.
Switched to javax.inject