restructure domain targets to allow updating without locking