Updated class to be singleton