Removed singleton pattern