Started to separate domain and service.