Removed singleton dependency