Added domain checks