Refactor to use Bill singleton model.