Add domain and instances support