Removed singleton construction in each service