Domain + artifacts check re-factoring