Add Choice domain and service classes