Simplify to use bool instead of storing domain name