Update to handle mutiple domains for klosters