adding collections and domain cleanups