Added override to service getInstance() factory method to fix issues