Refactored away from Ebean singleton.