domain and artifacts checks refactoring